Fix attach/attach->parent type. (#136919, Tim Mooney)

Thu Mar 11 16:28:15 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
        type. (#136919, Tim Mooney)

diff --git a/ChangeLog b/ChangeLog
index 8063147a51b787a9b5880c25bd46baa77537e200..f86149313eb6fec5986c4a747477a88510a4875c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 11 16:28:15 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
+       type. (#136919, Tim Mooney)
+
 Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8063147a51b787a9b5880c25bd46baa77537e200..f86149313eb6fec5986c4a747477a88510a4875c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Mar 11 16:28:15 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
+       type. (#136919, Tim Mooney)
+
 Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8063147a51b787a9b5880c25bd46baa77537e200..f86149313eb6fec5986c4a747477a88510a4875c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Mar 11 16:28:15 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
+       type. (#136919, Tim Mooney)
+
 Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8063147a51b787a9b5880c25bd46baa77537e200..f86149313eb6fec5986c4a747477a88510a4875c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Mar 11 16:28:15 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
+       type. (#136919, Tim Mooney)
+
 Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8063147a51b787a9b5880c25bd46baa77537e200..f86149313eb6fec5986c4a747477a88510a4875c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Mar 11 16:28:15 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_get_toplevel): Fix attach/attach->parent
+       type. (#136919, Tim Mooney)
+
 Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index fa59b852d60955e92c88f4cf8169857678fe0608..7cbaa6a594d4eec731b2c2017697989828f82dc9 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1659,10 +1659,10 @@ gtk_menu_get_toplevel (GtkWidget *menu)
     attach = attach->parent;
 
   if (GTK_IS_MENU (attach))
-    return gtk_menu_get_toplevel (attach->parent);
+    return gtk_menu_get_toplevel (attach);
   else if (GTK_IS_WIDGET (attach))
     {
-      toplevel = gtk_widget_get_toplevel (attach->parent);
+      toplevel = gtk_widget_get_toplevel (attach);
       if (GTK_WIDGET_TOPLEVEL (toplevel)) 
        return toplevel;
     }